Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Apr 2010 00:59:45 +0000 (00:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 12 Apr 2010 00:59:45 +0000 (00:59 +0000)

Trivial merge